From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 23 Jan 2021 22:12:05 +0000 (+0100)
Subject: Make (subdirs . nil) in .dir-locals.el work
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~28^2~15^2~4380
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=75f6b264f549ee66faae75bfbad4d3f7602e2a64;p=emacs.git

Make (subdirs . nil) in .dir-locals.el work

* lisp/files.el (dir-locals-collect-variables): Don't
destructively modify the cached structure (bug#17205), because
that means that (subdirs . nil) doesn't work.
---

diff --git a/lisp/files.el b/lisp/files.el
index d2e5413b3ad..7af5549bcb0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4062,7 +4062,7 @@ Return the new variables list."
                      (subdirs (assq 'subdirs alist)))
                 (if (or (not subdirs)
                         (progn
-                          (setq alist (delq subdirs alist))
+                          (setq alist (remq subdirs alist))
                           (cdr-safe subdirs))
                         ;; TODO someone might want to extend this to allow
                         ;; integer values for subdir, where N means